GtkMenu: fixed more NULL dereferencing segfault
authorJuan Pablo Ugarte <juanpablougarte@gmail.com>
Thu, 1 May 2014 23:31:31 +0000 (20:31 -0300)
committerJuan Pablo Ugarte <juanpablougarte@gmail.com>
Thu, 1 May 2014 23:31:31 +0000 (20:31 -0300)
gtk/gtkmenu.c

index e011e953c185948fedcbcce426d18cd36b6bc45f..f29ac125cf205eaf7d4ab99d137a9f745ac16428 100644 (file)
@@ -3267,12 +3267,12 @@ gtk_menu_get_preferred_height (GtkWidget *widget,
                                gint      *minimum_size,
                                gint      *natural_size)
 {
-  gint min_width;
+  gint min_width, nat_width;
 
   /* Menus are height-for-width only, just return the height
    * for the minimum width
    */
-  GTK_WIDGET_GET_CLASS (widget)->get_preferred_width (widget, &min_width, NULL);
+  GTK_WIDGET_GET_CLASS (widget)->get_preferred_width (widget, &min_width, &nat_width);
   GTK_WIDGET_GET_CLASS (widget)->get_preferred_height_for_width (widget, min_width, minimum_size, natural_size);
 }